Layout changes

- Improved navbar
- Added wrapper
- Other minor tweaks