Merge pull request #5608 from Starsam80/qt-should-be-like-wx Qt/MappingWindow: Update layout to match WX