Fixes and Added Cirlce Icon