Changed up application navigation and underlying logic.