Added first segments of code
Removed unneeded buttons code
Merge branch 'master' into Reference-swapper-dev
Fix x86 compilation issue for Release build