Refactored SASS and Templates (especially forms)