Improve menu and add restart option