Some Improvements for Content UI