Working on the unit selection screen