Minor layout changes and context.