Moving to sane multi-app layout