Code cleanup & SOC
UI improvements and SOC
merge conflicts fixed