scroll top button fix, add nav-bar-ef
add 5px to progress-bar
merge