revise layout, nav bar