Update UI and navigations

Update UI and navigations