Merge CSS and footer changes to master

Merging in changes to master