SONAR-5134 Fix up/down navigation, clean spinner display