Improved form. Fixed entry editing. Refactored re-rendering