Addnl changes to UI
merged changes :rahul