finalized color change, added padding here and there