reorganized location and fixed smooth-scroll