Category/Update Prevent the fields from bouncing around

A bit of UX adjustment

Fixes #3