Several style changes