Add remove button and function, add show button