last minute css and template changes
Merge branch 'patrick' into dev