fixup! addressing technical/UI feedback