Worked on navigation, focus