Added better usability for Select activity