Added restart option and death screen, refactored code