Move objects to object layer and draw correctly.
Commit minor change to the map.

Tiled has a bug it looks like.