sped up modal, badge and se-select tweaks