Henrik Reitan #1.8
Fixed rendering of markers