export names fixed. some small amendments in navigation