fix some css and re-factor colors