re-doing layout nesting