Clean up js and make circle and marker green