Rearranged create form