Added tabs and the fixed restart option