fixed nav-bar and added modal view