code clean up
highlight nav and working on refresh button