UI Updates to Self View
Blah
Merge branch 'river' of https://github.com/hippiehunter/Baconography into river