Fix edit and create page