new UI changes 

new UI changes and junit test code