and more styling changes