Cleaned up edit form