Fix Nav Bar

- Gave the Nav bar margin instead of padding
- Little Fixes and Formatting