RE: Layout support + widget fixes