Prettify nav buttons and fix some bugs