adding more orginasation to the structure and more work on the navigation