[#1027] - Suraj/Samiksha - extracted keypad and confirm quit from generator and solver.