lots more work on styling