Revert "Revert "Fix for edit page""
Merge pull request #98 from katorie/revert-94-revert-91-fix-for-edit-page

Revert "Revert "Fix for edit page""