Cleaned up some boilerplate, Updated routing for hyphens, Added Navigation view and Model