Edit/View page stuff
Merge pull request #4 from pbrought/master

Edit/View page stuff