whitespace cleanup
reorder some styles to be more sass