tweeks to feedback ui
Merge branch 'release/pico' into develop