More styling work, added remove icon