Clean up map
Added Layer demo