General style tweaks.
Merge pull request #1532 from arkon94/sass-general

General style tweaks