A few layout improvements
:D