Some work on ensuring the view is restored when switching fullscreening

This code is ugly, and the layouting is not great, but it is at least
slightly less terrible than it was before... It needs work.