[#1003] - Suraj/Samiksha - using buttons instead of keyboard.