Change overview to fit screen and fix some textblock swap