[JOHNNYFIVE-62] Modified the UI and the navigation in the app