Updated the edit/manage code and the new template