Navigation UI fixed