Continued layout updates

Lots of updates, adding a little decoration