Fix bug on main activity map, add all setting able in navigate and detail activity, fix lifecycle bug, improve ui design
solve merge conflict