Almost Final

Still need to fix remove and clicking on X icon.