added nav and other random stuff