improve design (put all in nav bar)