Add show
Merge branch 'master' into cleanup

* master:
  Add show
Style nav and faces