Improved drag handling and catching for two sections layout, closes #47