Added tabs with location handler (1 issue remains, see issues with tabs), also cleaned up views