added nav bar and flat-ui
fixed merge conflict