add edit button, some other polishes