Editing entry state
Some layout improvements