Updated UI and added navigation bar
UI modified