ui changes and pass all tests
merged changes