Restart capability started

Minor changes (used game state instead of removing/adding components when drawing/updating)
Bug fixes