Added fixes to content navigation & few lexical issues