Fix bucket new/edit pages