restructure scss
reorder
remove inline style class