ui changes
merged with rimal