added the second edition of UI for different layout
fixed angular tooltip conflics
merged