Refactor nav class style and various margin tweaks