Added menu and a signal handler