Simplify layout and use more accepted navigation construct.