Refactored:

- Some of the main layouts.