More styling changes - still in progress