minor improvements in UI modules