SONAR-5623 Further frontend work