Some changes have been made recently based on feedback for safety. Hopefully last changes and final main layout.