CSS re-designed based on the mock