update
merge
Rename namespace to correct spelling and implement index view