Add counts to markers, style tweaks
Remove toast debug stmts