much organization and cleanup, added a few scss snippets