Fixes display issue in menu modal
Brings Menu to Menu link in nav bar (static)
Restructures files for sanity sake