Sass cleanup and formatting

Cleaned up formatting and organized files, minor changes