Refactor sass / css further