UI changes and javascript changes