Refactor all teh css