fixing broken styleswitch and padding for review