Add more styling and fixes