Fix snapper and refactor feedback section (WIP)