Organise the tasks and interfaces better