Add a remove button & command line options