Added remove and hide buttons