Some styles changes and other stuff