added return to base and victory screens
Removing touch based experimentations, cleaning up all new additions
Manual merge of dev_sramanujan and dev_anpatel