goniometer UI rework part two