Code refactor and update front-end to movable markers and change color with state change