Working on nav and demos