more styling and fixes