More content and ui changes