CLC-1809 Livestyle tweaks