Map: Ensure all popups are closable
MCOP: Fix Tasks layer & Theme tweak