UI & pan improvements