added stop button and shortcuts