UPDATED
* Performance improvements while navigating through the app
