layout changes, added context