Working version with layout changes.