Added CMD_Q to quit the app