Move remaining view composers