Small changes. Fixing merge and adding to style.css