Slight nav restructure

Been fiddling with a few bits, kind of all over the place in regards to topic. So please review best you can.