Start refactoring css
Pull master