Fixed UI for manual entry and edit table

Fixes bug #578