minor ui changes
fix
merge