Correct error causing menu to fail, rewrite layouts
Fix errors with the stylings with the layouts and a couple of typos