Updated views and template files to fix multiple bugs like hitting the app for the first time