Continue work on Navigation and dashboard details