Fixed creation form bugs