added freestlye and fixed nav with temp hack