Improved layouts, minor changes.
Improved layout