A bit more work on styling