refactor some sass structure, small style increments