Remove some unnecesserary layout nesting