Updated style.scss

Formatted styles with better format and cascade