Added enable/disable arrange functionality.