Fixes right clicking in runtime.
Adds End and Restart functions.