Navigation and dashboard clean up