rolling back UI and updating nav layout
Merge branch 'blake' of https://github.com/blaketmiller/devnull into blake