Calculate the enabled set properly and tweak the UI