Fix indicator position
Fix browser back issue