Reworked some of the look and feel