Category/Update Prevent bouncing and keep messages

A bit of UX adjustment

Fixes #3