Tools - mobile improvements