All Data Views Rebuilt

Now returning to Main Navigator