cleaning up backbone views, modifying some nav functionality
Merge branch 'user_features'