fixed nav-bar to top, code cleanup