Adding navigation module.  Various other fixes.