Updated the way feedback is displayed, in a modular fashion