Improved navigation and aesthetics