Improve user interface and add skip/stop functions