revised dictionary and plan, fixed some nav bar issues