Restructure navbar