mproved Navigation class