added nav bar. started to remove vars