Updated content and fix ui issue.