Many more styling changes