Correction and code cleanup

This commit consists of fixing the parts of my earlier commit which overwrote John's changes. I also made some code cleanup changes and put the owner_name on the dashboard