Layout improvements
All of the fixups