UI changes and more content added