updated framework
worked on navigation code