lots of changes including text navigation