Formatting and rearranging controllers