Re-organized app to drop navigation drawer for now