Some work on styling and layout