Added position watch and button for showing current position