Added selection marker. General improvements