Added checkboxes for markers and areas, and style tweaks