Fix review decorator
Add messages to layout
Fix specs for categories