styling and minor functionality fixes

styling enhancements and functionality tweaks