refactor , clean code, change icon, add pop up window marker , add show marker option menu