Added a couple navigation & layout improvements