Add marker clustering and grouped layer control