Added remove button and finalized UI