styling and fixes