Tweak right hand column / simplify whitelist nav. logic