Fixing CRUD elements