Some more work on styling and UI