mini fixes and edit button added but doesnt work yet