Render and layout improvements