Fixed todo and added edit button