reorganized top-bar navigation