Fixing user settings menu, getting ready to run tests.
Merge branch 'ef6tracing' of https://github.com/chaim1221/Machete into ef6tracing