Merging in changes to get the badge display to look good

Also started on Activities view, but realized that I need an ActivitySubmissionEdit object before I can bind to that form. ActivityEdit is for the BadgeManager.

I am going to probably work on BadgeManager next.