(feature) lots more work on styling