Fix up sass, clean up