Feature/highlight feedback messages