users finished and nav added
forgot to include some files
view presenters and index pages updated
nav changes
merge conflict