ux-lamp improvements