Use custom markers, add a bit of graphics
Center markers and other minor improvements
Organize imports
Merges