More weights and layout changes.