more styling and small fixes