Working on restructuring user flow throughout the app
Merge branch 'master' into style