Working to improve home index view and fixing role issue
Fixing merge conflict in user
Making the home index view a bit easier to read and moving some logic out of the view