Make controller view extend all the way
Merge remote-tracking branch 'main/master'