some ui changes
fix conflicts
fix conflicts