Q&D fix for Join / Split
Organized windows, fixed View