Fix issue with taskshowing after close settings
Fix issues with layoutswitching