Added autostart option, fixed restart button