Did a lot of styling updates.
Fixed merge conflict in application.css.