content update and ui fix