Reworking the selections tab