UI improvements and SOC