Fixed styling to be "production" ready