Fix two markers bug
UI Improvements