added scroll views to layouts, fixed nav bar order