updated styles and such
 adding revised files from resolved merge conflict
Merge branch 'styles'