Styling & template updates
Merge remote-tracking branch 'origin/rick'