Updated navigation and finishing updated UI