Fixed bug where edit button was caching