fix marker remove and display should work fine
refactor some markers code