added more css
fixed merge conflict with application.html.erb