More constraints cleanup. Added a relayout() implementation.