Added menu option and pause/resume handling