Refactor content editing + Better GUI for content editing