Still working on the edit and create page