add nav icons, reorder nav items

big update, don't pull if you don't want icons in nav!