A few more updates on layout and content