aaron: various fixes, added navigation