rework overall flow per wireframes; navigation drawer tweaks to re-align
with v11 implementation