Add view, edit, and some hotfix