Try to get the version straight
Finish dashboard and profile views
Merge conflicts resolved