adding edit/cancel buttons plus string check for tags