Reworking some styles for new layout