A few more styling changes..