Major changes to styling