Working on the Awards and guide views. Mostly done. Also merging code
Merge remote-tracking branch 'origin/master'