big changes, setting up nav etc