changed: slight layout changes