some design changes, view_state fixes, massive navigation  updates