Changes

- Overhaul layout