updated marker icons and views
merged files