Several style updates