Removed clustering, added toggle icon ability