Merge "Adding menu to arrange one or two tasks and arrange them accordingly"