few ui changes
merged