Julies changes from last night. Template and style changes for responsive
Merge branch 'patrick' into dev