Initial attempt to include category in navigation
Various changes, remove container list and edit