General styling

Merge styling changes to master for initial deployment