Layer gear icon showing up again in maps view.
Layer gear icon now added only once.
Code grooming.