Added edit form, change title, refactor total