Added remove and submit buttons