Fixed JS loading order
Merge remote branch 'upstream/master'
add js render + add icon marker