Reworking navigation to be a little more functional. Not sure if this is the right direction at the moment