added more
js ui updates
menus
merged
merged