Add Restart button, fix bug