Added remove icon

added remove icon
fixed some minor bugs