Merged kevin's ui changes