Improved UI and fixed navigation bug