small edits to order of controllers