Added Selection Screen functionality