MID-2023 - improving navigation in configuration menu. Also, small profiling code cleanup.