Changes to styling and fix error