ux enhancements, refactored for simpler DOM