Last commit before menu rewrite
Completed moving menu items to header, and styled correctly