Update content and fix layout