navigation tree re-worked
tidy up