Working on new navigation

the new navigation will eventually replace the current one once all the
bigs have been ironed out :)