move to new controller layout